Skip to content

fix: don't inherit inherited map attribute#292

Merged
ymc9 merged 44 commits intozenstackhq:devfrom
dhritcu:fix/issue-291
Oct 9, 2025
Merged

fix: don't inherit inherited map attribute#292
ymc9 merged 44 commits intozenstackhq:devfrom
dhritcu:fix/issue-291

Conversation

@dhritcu
Copy link
Contributor

@dhritcu dhritcu commented Oct 9, 2025 •
edited by coderabbitai bot
Loading

Resolves #291

Summary by CodeRabbit

  • Bug Fixes
    • Corrected Prisma schema generation to ignore inherited mapping attributes from base models, preventing unintended propagation of @@Map. This eliminates duplicate or invalid mappings in generated schemas, reducing validation and migration errors and producing more predictable output.

ymc9 added 30 commits June 17, 2025 13:08
@ymc9
Merge pull request zenstackhq#29 from zenstackhq/dev
77ea76c 
merge dev to main
@ymc9
Merge pull request zenstackhq#31 from zenstackhq/dev
2db2993 
merge dev to main (3.0.0-alpha.4)
@ymc9
Merge pull request zenstackhq#44 from zenstackhq/dev
ca05f6d 
merge dev to main
@ymc9
Merge pull request zenstackhq#53 from zenstackhq/dev
50a3a79 
merge dev to main (v3.0.0-alpha.6)
@ymc9
Merge pull request zenstackhq#58 from zenstackhq/dev
7322db8 
merge dev to main
@ymc9
Merge pull request zenstackhq#61 from zenstackhq/dev
c225e62 
merge dev to main
@ymc9
Merge pull request zenstackhq#66 from zenstackhq/dev
f638291 
merge dev to main
@ymc9
Merge pull request zenstackhq#72 from zenstackhq/dev
d3e56be 
merge dev to main
@ymc9
Merge pull request zenstackhq#82 from zenstackhq/dev
04323de 
merge dev to main
@ymc9
Merge pull request zenstackhq#87 from zenstackhq/dev
8398575 
merge dev to main
@ymc9
Merge pull request zenstackhq#96 from zenstackhq/dev
8f8d6de 
merge dev to main
@ymc9
Merge pull request zenstackhq#99 from zenstackhq/dev
ed6cfe6 
merge dev to main
@ymc9
Merge pull request zenstackhq#119 from zenstackhq/dev
30fc2fa 
merge dev to main (v3.0.0-alpha.13)
@ymc9
Merge pull request zenstackhq#125 from zenstackhq/dev
c9d5e1d 
merge dev to main (v3.0.0-alpha.14)
@ymc9
Merge pull request zenstackhq#128 from zenstackhq/dev
99eb798 
merge dev to main (v3.0.0-alpha.15)
@ymc9
Merge pull request zenstackhq#132 from zenstackhq/dev
94a0c6f 
merge dev to main (v3.0.0-alpha.16)
@ymc9
Merge pull request zenstackhq#137 from zenstackhq/dev
c76ae24 
merge dev to main (v3.0.0-alpha.17)
@ymc9
Merge pull request zenstackhq#142 from zenstackhq/dev
4e359fc 
merge dev to main (v3.0.0-alpha.18)
@ymc9
Merge pull request zenstackhq#149 from zenstackhq/dev
0040e9d 
merge dev to main (v3.0.0-alpha.19)
@ymc9
Merge pull request zenstackhq#154 from zenstackhq/dev
9b36641 
merge dev to main
@ymc9
Merge pull request zenstackhq#157 from zenstackhq/dev
c10e48f 
merge dev to main (v3.0.0-alpha.21)
@ymc9
Merge pull request zenstackhq#160 from zenstackhq/dev
aec0096 
merge dev to main (v3.0.0-alpha.22)
@ymc9
Merge pull request zenstackhq#163 from zenstackhq/dev
726b826 
merge dev to main (v3.0.0-alpha.23)
@ymc9
Merge pull request zenstackhq#166 from zenstackhq/dev
a607b46 
merge dev to main (v3.0.0-alpha.24)
@ymc9
Merge pull request zenstackhq#174 from zenstackhq/dev
acbd2ae 
merge dev to main (v3.0.0-alpha.25)
@ymc9
Merge pull request zenstackhq#177 from zenstackhq/dev
6262b76 
merge dev to main (v3.0.0-alpha.26)
@ymc9
Merge pull request zenstackhq#185 from zenstackhq/dev
c5660c5 
merge dev to main (v3.0.0-alpha.27)
@ymc9
Merge pull request zenstackhq#188 from zenstackhq/dev
32691ce 
merge dev to main
@ymc9
Merge pull request zenstackhq#191 from zenstackhq/dev
23c58bd 
merge dev to main (v3.0.0-alpha.29)
@ymc9
Merge pull request zenstackhq#193 from zenstackhq/dev
be99d9a 
merge dev to main
ymc9 and others added 14 commits August 22, 2025 02:30
@ymc9
Merge pull request zenstackhq#198 from zenstackhq/dev
ccf968e 
merge dev to main (v3.0.0-alpha.30)
@ymc9
Merge pull request zenstackhq#205 from zenstackhq/dev
c879a87 
merge dev to main
@ymc9
Merge pull request zenstackhq#209 from zenstackhq/dev
c2d87a8 
merge dev to main
@ymc9
Merge pull request zenstackhq#214 from zenstackhq/dev
74bbc28 
merge dev to main (v3.0.0-alpha.33)
@ymc9
Merge pull request zenstackhq#224 from zenstackhq/dev
02d47dd 
merge dev to main (v3.0.0-beta.1)
@ymc9
Merge pull request zenstackhq#228 from zenstackhq/dev
31d2626 
merge dev to main
@ymc9
Merge pull request zenstackhq#234 from zenstackhq/dev
a115040 
merge dev to main (v3.0.0-beta.2)
@ymc9
Merge pull request zenstackhq#238 from zenstackhq/dev
28ab57b 
merge dev to main (v3.0.0-beta.3)
@ymc9
Merge pull request zenstackhq#249 from zenstackhq/dev
96315a9 
merge dev to main (v3.0.0-beta.4)
@ymc9
Merge pull request zenstackhq#261 from zenstackhq/dev
495a512 
merge dev to main
@ymc9
Merge pull request zenstackhq#267 from zenstackhq/dev
1770b12 
merge dev to main (v3.0.0-beta.6)
@ymc9
Merge pull request zenstackhq#272 from zenstackhq/dev
5f639de 
merge dev to main (v3.0.0-beta.7)
@ymc9
Merge pull request zenstackhq#280 from zenstackhq/dev
35a9e0d 
merge dev to main (v3.0.0-beta.8)
@dhritcu
fix: don't inherit inherited map attribute
0bf7a4f
@coderabbitai
Copy link

coderabbitai bot commented Oct 9, 2025 •
edited
Loading

Walkthrough

The PrismaSchemaGenerator now filters model attributes to exclude inherited @@Map attributes from base models. A new private helper, isInheritedMapAttribute, detects map attributes originating from a different container. Attribute generation uses this guard to include only Prisma attributes relevant to the current model context.

Changes

Cohort / File(s) Summary
Prisma schema generation filtering
packages/sdk/src/prisma/prisma-schema-generator.ts		 Added isInheritedMapAttribute helper and updated attribute processing in generateModel to skip inherited @@Map attributes; ensures only current-context Prisma attributes are emitted.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Poem

I twitched my whiskers, sifted the hay,
Skipped the maps that wandered away—
Only the local glyphs may stay.
In Prisma fields I hop and play,
Guarding context, come what may.
Thump! Clean schemas lead the way. 🐇✨

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title Check ✅ Passed The title clearly summarizes the core change of preventing inherited map attributes from being applied by indicating “don’t inherit inherited map attribute,” which aligns directly with the code updates filtering out inherited @@Map attributes in the PrismaSchemaGenerator. It concisely reflects the fix without introducing unrelated details.
Docstring Coverage ✅ Passed No functions found in the changes. Docstring coverage check skipped.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

coderabbitai[bot]
coderabbitai bot reviewed Oct 9, 2025
View reviewed changes
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/sdk/src/prisma/prisma-schema-generator.ts (1)

190-197: Implementation correctly identifies inherited @@map attributes.

The logic properly checks if an attribute is inherited (different container) and is specifically a @@map attribute. The nullish coalescing operator safely handles cases where the reference is unresolved.

Consider adding JSDoc to explain why only @@map is filtered among inherited attributes:

+    /**
+     * Checks if an attribute is an inherited @@map attribute.
+     * @@map attributes define table names and should not be inherited
+     * from base models, as each model should have its own table mapping.
+     */
     private isInheritedMapAttribute(attr: DataModelAttribute, contextModel: DataModel) {
📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 35a9e0d and 0bf7a4f.

📒 Files selected for processing (1)
  • packages/sdk/src/prisma/prisma-schema-generator.ts (2 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
{packages,samples,tests}/**

📄 CodeRabbit inference engine (CLAUDE.md)

Place packages only under packages/, samples/, or tests/

Files:

  • packages/sdk/src/prisma/prisma-schema-generator.ts
🧬 Code graph analysis (1)
packages/sdk/src/prisma/prisma-schema-generator.ts (2)
packages/language/src/generated/ast.ts (4)
  • DataModelAttribute (395-400)
  • DataModelAttribute (402-402)
  • DataModel (377-387)
  • DataModel (389-389)
packages/language/src/ast.ts (1)
  • DataModel (49-54)
🔇 Additional comments (1)
packages/sdk/src/prisma/prisma-schema-generator.ts (1)

174-176: Filtering logic correctly excludes inherited @@map; no other inherited model-level attributes detected.

@ymc9 ymc9 changed the base branch from main to dev October 9, 2025 18:13
ymc9
ymc9 approved these changes Oct 9, 2025
View reviewed changes
Copy link
Member

@ymc9 ymc9 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for making the fix, @dhritcu

@ymc9 ymc9 merged commit 831cb66 into zenstackhq:dev Oct 9, 2025
5 of 6 checks passed
This was referenced Dec 13, 2025
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@coderabbitai coderabbitai[bot] coderabbitai[bot] left review comments

@ymc9 ymc9 ymc9 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[BUG] When using extend, the @@map is inherited as well

2 participants

@dhritcu @ymc9